Adding a little flexibility